[XEND] Reapply fix for ever expanding kernel_args in XendConfig

Signed-off-by: Alastair Tse <atse@xensource.com>

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index 8cec14ba0e4a4e5450f398c51c05ce3910cc426c..375ba473a40d6b42dd665de3bb44dd0aa70e1932 100644 (file)
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -554,7 +554,7 @@ class XendConfig(dict):
 
             # attempt to extract extra arguments from SXP config
             arg_ip = sxp.child_value(image_sxp, 'ip')
-            if arg_ip and not re.search(r'ip=[0-9\.]+', kernel_args):
+            if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
                 kernel_args += ' ip=%s' % arg_ip
             arg_root = sxp.child_value(image_sxp, 'root')
             if arg_root and not re.search(r'root=[^ ]+', kernel_args):
@@ -1019,7 +1019,7 @@ class XendConfig(dict):
         
         # attempt to extract extra arguments from SXP config
         arg_ip = sxp.child_value(image_sxp, 'ip')
-        if arg_ip and not re.search(r'ip=[0-9\.]', kernel_args):
+        if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
             kernel_args += ' ip=%s' % arg_ip
         arg_root = sxp.child_value(image_sxp, 'root')
         if arg_root and not re.search(r'root=', kernel_args):